[gtk3] [x11] Fix coordinate space of rect in gdk_x11_window_get_frame_extents when...
authorEmilio Cobos Álvarez <emilio@crisal.io>
Mon, 20 Jun 2022 08:43:06 +0000 (10:43 +0200)
committerEmilio Cobos Álvarez <emilio@crisal.io>
Mon, 20 Jun 2022 08:43:06 +0000 (10:43 +0200)
This is the same fix as !4820, but applied to the gtk 3 branch.

gdk/x11/gdkwindow-x11.c

index 721d9bb63aa8f400297661005176cccafc1bd9fa..eb822e0989083341883cb8cbf51e3edab83a4a9d 100644 (file)
@@ -3240,14 +3240,19 @@ gdk_x11_window_get_frame_extents (GdkWindow    *window,
   impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   /* Refine our fallback answer a bit using local information */
-  rect->x = window->x * impl->window_scale;
-  rect->y = window->y * impl->window_scale;
-  rect->width = window->width * impl->window_scale;
-  rect->height = window->height * impl->window_scale;
+  rect->x = window->x;
+  rect->y = window->y;
+  rect->width = window->width;
+  rect->height = window->height;
 
   if (GDK_WINDOW_DESTROYED (window) || impl->override_redirect)
     return;
 
+  rect->x *= impl->window_scale;
+  rect->y *= impl->window_scale;
+  rect->width *= impl->window_scale;
+  rect->height *= impl->window_scale;
+
   nvroots = 0;
   vroots = NULL;